From 004746f41c9334edfbebccd4ca9b3262c1d7652f Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 8 Jun 2005 15:13:43 +0000 Subject: [PATCH] bitkeeper revision 1.1691.1.10 (42a70b27-Oq9klHVoCm0PlmeoehF8g) Config option is CONFIG_X86_PAE, not CONFIG_PAE. Signed-off-by: Keir Fraser --- xen/arch/x86/mm.c | 6 +++--- xen/include/asm-x86/page.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 204c9d74e8..083d967e25 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1104,7 +1104,7 @@ static int mod_l3_entry(l3_pgentry_t *pl3e, return 0; } -#ifdef CONFIG_PAE +#ifdef CONFIG_X86_PAE /* * Disallow updates to final L3 slot. It contains Xen mappings, and it * would be a pain to ensure they remain continuously valid throughout. @@ -1400,7 +1400,7 @@ int get_page_type(struct pfn_info *page, u32 type) else if ( ((type & PGT_va_mask) != PGT_va_mutable) && ((type & PGT_va_mask) != (x & PGT_va_mask)) ) { -#ifdef CONFIG_PAE +#ifdef CONFIG_X86_PAE /* We use backptr as extra typing. Cannot be unknown. */ if ( (type & PGT_type_mask) == PGT_l2_page_table ) return 0; @@ -1671,7 +1671,7 @@ int do_mmuext_op( break; -#ifndef CONFIG_PAE /* Unsafe on PAE because of Xen-private mappings. */ +#ifndef CONFIG_X86_PAE /* Unsafe on PAE because of Xen-private mappings. */ case MMUEXT_PIN_L2_TABLE: type = PGT_l2_page_table; goto pin_page; diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 2f134031c2..883acd13dd 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -185,7 +185,7 @@ typedef struct { u64 pfn; } pagetable_t; #define pfn_valid(_pfn) ((_pfn) < max_page) /* High table entries are reserved by the hypervisor. */ -#if defined(CONFIG_X86_32) && !defined(CONFIG_PAE) +#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE) #define DOMAIN_ENTRIES_PER_L2_PAGETABLE \ (HYPERVISOR_VIRT_START >> L2_PAGETABLE_SHIFT) #define HYPERVISOR_ENTRIES_PER_L2_PAGETABLE \ -- 2.30.2